diff --git a/conf b/conf
index db7410a..4839b60 100755
--- a/conf
+++ b/conf
@@ -11,7 +11,7 @@ TARGET_HOST=$(nix eval --raw -f vpn.nix ips.$host)
 #TARGET_HOST=192.168.178.1
 case $2 in
     copy-keys)
-        $0 exec "$2" nix build -f "<nixpkgs/nixos>" config.deployment.keys-copy --out-link copy-keys
+        nix build -f servers.nix "$host".config.deployment.keys-copy --out-link copy-keys
         ./copy-keys/bin/copy-keys "$TARGET_HOST"
         # rm ./copy-keys
         ;;
diff --git a/servers.nix b/servers.nix
index 7dd2986..de9305a 100644
--- a/servers.nix
+++ b/servers.nix
@@ -7,4 +7,6 @@ let
   };
   names = [ "pennyworth" "jarvis" "blackadder" "woodhouse" "frumar" "zazu" ];
 in
-nixpkgs.lib.genAttrs names (name: (nixos name [ ./roles (./logical + "/${name}.nix") ]).config.system.build.toplevel)
+nixpkgs.lib.genAttrs names (name: (let os =
+                                         nixos name [ ./roles (./logical + "/${name}.nix") ]; in
+                                     os.config.system.build.toplevel // os))