diff --git a/home-manager/flake-module.nix b/home-manager/flake-module.nix
index f37c2e14..9faa7c6f 100644
--- a/home-manager/flake-module.nix
+++ b/home-manager/flake-module.nix
@@ -35,6 +35,6 @@
         modes);
   in {
     homeConfigurations = lib.mapAttrs (_: buildHomeManager) (flattenAttrs machines);
-    homeModes = lib.mapAttrs buildModesForHost machines;
+    homeModes = lib.mapAttrs buildModesForHost {inherit (machines) zeus apollo;};
   });
 }
diff --git a/nixos/roles/home-manager.nix b/nixos/roles/home-manager.nix
index 32aa31f9..fec06449 100644
--- a/nixos/roles/home-manager.nix
+++ b/nixos/roles/home-manager.nix
@@ -3,6 +3,6 @@ flake-inputs: {config, ...}: {
   home-manager = {
     backupFileExtension = "home-manager-backup";
     useGlobalPkgs = true;
-    users.maralorn = flake-inputs.self.homeConfigurations.${config.networking.hostName};
+    users.maralorn = (import ../../home-manager/machines.nix).${config.networking.hostName}.default;
   };
 }