diff --git a/flake.nix b/flake.nix
index 8f558934..2ecb0576 100644
--- a/flake.nix
+++ b/flake.nix
@@ -449,20 +449,21 @@
       # ignoring the shell entry by simply prefixing it with a space which most
       # command-line shells have support for (e.g., Bash, zsh, fish).
       deploy.nodes = let
-        importNodes = prefix: systems:
+        importNodes = { prefix, activation ? prefix, environments, system ? defaultSystem }:
           lib'.mapAttrs'
             (name: value:
-              lib'.nameValuePair "${prefix}-name" {
+              lib'.nameValuePair "${prefix}-${name}" {
                 hostname = name;
                 profiles.system = {
                   sshUser = "admin";
                   user = "root";
-                  path = inputs.deploy.lib.${defaultSystem}.activate.nixos value;
+                  path = inputs.deploy.lib.${defaultSystem}.activate."${activation}" value;
+                  remoteBuild = true;
                 };
             })
-            systems;
-      in (importNodes "nixos" self.nixosConfigurations)
-         // (importNodes "home-manager" self.homeManagerConfigurations);
+            environments;
+      in (importNodes { prefix = "nixos"; environments = self.nixosConfigurations; })
+         // (importNodes { prefix = "home-manager"; environments = self.homeManagerConfigurations; });
 
       # How to make yourself slightly saner than before. So far the main checks
       # are for deploy nodes.