diff --git a/hosts/common/fs.nix b/hosts/common/fs.nix
index 5673f0058..00ccc9aa5 100644
--- a/hosts/common/fs.nix
+++ b/hosts/common/fs.nix
@@ -75,7 +75,7 @@ let
     ];
   };
 
-  ifSshAuthorized = lib.mkIf config.sane.hosts.by-name."${config.networking.hostName}".ssh.authorized;
+  ifSshAuthorized = lib.mkIf (((config.sane.hosts.by-name."${config.networking.hostName}" or {}).ssh or {}).authorized or false);
 
   remoteHome = name: { host ? name }: let
     mountpoint = "/mnt/${name}/home";
diff --git a/hosts/instantiate.nix b/hosts/instantiate.nix
index 0c4301c9c..8a5cfd23e 100644
--- a/hosts/instantiate.nix
+++ b/hosts/instantiate.nix
@@ -8,9 +8,10 @@
 
 {
   imports = [
-    ./by-name/${hostName}
     ./common
     ./modules
+  ] ++ lib.optionals (builtins.pathExists ./by-name/${hostName}) [
+    ./by-name/${hostName}
   ];
 
   networking.hostName = hostName;
diff --git a/impure.nix b/impure.nix
index 558576c55..3403547b0 100644
--- a/impure.nix
+++ b/impure.nix
@@ -48,12 +48,17 @@ let
   };
 
   hosts = lib.foldl' (acc: host: acc // mkHost host) {} [
+    # real hosts:
     { name = "crappy"; system = "armv7l-linux";  }
     { name = "desko";  system = "x86_64-linux";  }
     { name = "lappy";  system = "x86_64-linux";  }
     { name = "moby";   system = "aarch64-linux"; }
-    { name = "rescue"; system = "x86_64-linux";  }
     { name = "servo";  system = "x86_64-linux";  }
+
+    { name = "rescue"; system = "x86_64-linux";  }
+    # pseudo hosts used for debugging
+    { name = "baseline-x86_64";  system = "x86_64-linux";  }
+    { name = "baseline-aarch64";  system = "aarch64-linux";  }
   ];
 
   pkgs = mkPkgs {};