diff --git a/flake.nix b/flake.nix
index 3ff6b1b..7e339e0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -178,6 +178,7 @@
 				./module/Ollama.nix
 				./module/PowersaveAmd.nix
 				./module/Print.nix
+				./module/RemoteBuild.nix
 				./module/VirtManager.nix
 				./user/Voronind.nix
 			];
@@ -200,9 +201,9 @@
 				./module/Docker.nix
 				./module/Ftpd.nix
 				./module/Gnome.nix
-				./module/NixServe.nix
 				./module/Ollama.nix
 				./module/PowersaveAmd.nix
+				./module/RemoteBuilder.nix
 				./user/Voronind.nix
 			];
 		};
diff --git a/module/RemoteBuild.nix b/module/RemoteBuild.nix
new file mode 100644
index 0000000..79e2deb
--- /dev/null
+++ b/module/RemoteBuild.nix
@@ -0,0 +1,15 @@
+{ config, pkgs, ... }: {
+	nix.buildMachines = [{
+		hostName = "home";
+		protocol = "ssh-ng";
+		system   = "x86_64-linux";
+		maxJobs     = 1;
+		speedFactor = 2;
+		mandatoryFeatures = [ ];
+		supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
+	}];
+	nix.distributedBuilds = true;
+	nix.extraOptions = ''
+		builders-use-substitutes = true
+	'';
+}
diff --git a/module/RemoteBuilder.nix b/module/RemoteBuilder.nix
new file mode 100644
index 0000000..d59eba9
--- /dev/null
+++ b/module/RemoteBuilder.nix
@@ -0,0 +1,5 @@
+{ ... }: {
+	nix.extraOptions = ''
+		extra-secret-key-files = /root/.nixcache/secret-key-file
+	'';
+}
diff --git a/module/common/Nix.nix b/module/common/Nix.nix
index 0f5d979..edc07c9 100644
--- a/module/common/Nix.nix
+++ b/module/common/Nix.nix
@@ -7,9 +7,9 @@
 		keep-derivations = true
 		keep-outputs = true
 		min-free = ${toString (50 * 1024 * 1024 * 1024)}
-		extra-substituters = https://nixcache.voronind.com
-		extra-trusted-substituters = https://nixcache.voronind.com
-		extra-trusted-public-keys = nixcache.voronind.com:i9dE2VZI40/LCM/mmUGs8kwal1bQo3xbSjrzxhInmOw=
+		extra-substituters = ssh-ng://home
+		extra-trusted-substituters = ssh-ng://home
+		extra-trusted-public-keys = home:i9dE2VZI40/LCM/mmUGs8kwal1bQo3xbSjrzxhInmOw=
 	'';
 	# max-free = ${toString (10 * 1024 * 1024 * 1024)}
 	# nix.gc = {