diff --git a/Droidnix/README.org b/Droidnix/README.org
index 15e18e561..036553128 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -158,11 +158,9 @@ in
     [ ../../../generated/users/henrov.nix
       ./boot.nix
       ./hardware-configuration.nix
-
-      # REQUIRED for Home Manager
-      home-manager.nixosModules.home-manager
     ]
-    ++ allModules;
+    ++ allModules
+    ++ [ home-manager.nixosModules.home-manager ];  # import HM last
 
   #################################
   # Home Manager integration
diff --git a/Droidnix/generated/hosts/traveldroid/host.nix b/Droidnix/generated/hosts/traveldroid/host.nix
index 9f526058c..b83bbabc6 100644
--- a/Droidnix/generated/hosts/traveldroid/host.nix
+++ b/Droidnix/generated/hosts/traveldroid/host.nix
@@ -28,11 +28,9 @@ in
     [ ../../../generated/users/henrov.nix
       ./boot.nix
       ./hardware-configuration.nix
-
-      # REQUIRED for Home Manager
-      home-manager.nixosModules.home-manager
     ]
-    ++ allModules;
+    ++ allModules
+    ++ [ home-manager.nixosModules.home-manager ];  # import HM last
 
   #################################
   # Home Manager integration