diff --git a/home-manager/machines.nix b/home-manager/machines.nix
index 726ff70c..0a4d4635 100644
--- a/home-manager/machines.nix
+++ b/home-manager/machines.nix
@@ -6,35 +6,33 @@ let
       m-0.hostName = hostName;
       nixpkgs.overlays = [ (_: _: (import ../channels.nix).${hostName}) ];
     };
+  makeAutostart = name:
+    { config, ... }: {
+      config.home.file.".config/autostart/${name}.desktop".source =
+        "${config.home.path}/share/applications/${name}.desktop";
+    };
+  makeBlock = list:
+    { pkgs, lib, ... }: {
+      systemd.user.services.blockserver = {
+        Unit.Description = "Serve a blocklist";
+        Service = {
+          ExecStart = "${pkgs.python3}/bin/python -m http.server 8842 -d ${pkgs.writeTextDir "blocklist" (lib.concatStringsSep "\r\n" list)}";
+          Restart = "always";
+        };
+        Install.WantedBy = [ "default.target" ];
+      };
+    };
 in
 {
   apollo =
     let
       install = f: ({ pkgs, ... }: { home.packages = f pkgs; });
-      makeAutostart = name:
-        { config, ... }: {
-          config.home.file.".config/autostart/${name}.desktop".source =
-            "${config.home.path}/share/applications/${name}.desktop";
-        };
       setStartpage = startpage:
         { ... }: {
           programs.firefox.profiles."fz2sm95u.default".settings = {
             "browser.startup.homepage" = startpage;
           };
         };
-      makeBlock = list:
-        { pkgs, lib, ... }: {
-          systemd.user.services.blockserver = {
-            Unit.Description = "Serve a blocklist";
-            Service = {
-              ExecStart = "${pkgs.python3}/bin/python -m http.server 8842 -d ${
-          pkgs.writeTextDir "blocklist" (lib.concatStringsSep "\r\n" list)
-          }";
-              Restart = "always";
-            };
-            Install.WantedBy = [ "default.target" ];
-          };
-        };
       setWorkspaceName = name:
         { pkgs, lib, ... }: {
           dconf.settings = {
@@ -154,6 +152,8 @@ in
       ./roles/tinkering.nix
       ./roles/update_tasks.nix
       ./roles/vdirsyncer.nix
+      (makeAutostart "kassandra2")
+      (makeAutostart "unlock-ssh")
     ];
   };
   hera = {