diff --git a/modules/hosts/john-pc-ubuntu.nix b/modules/hosts/john-pc-ubuntu.nix
index 82fd494..934154c 100644
--- a/modules/hosts/john-pc-ubuntu.nix
+++ b/modules/hosts/john-pc-ubuntu.nix
@@ -10,9 +10,7 @@ in
 	{
 		imports = with inputs.self.modules.homeManager; [
 			rebuild
-			zsh
 			john
-			ssh
 			resticprofile
 			sops
 			docker
diff --git a/modules/nix-tools/user.nix b/modules/nix-tools/user.nix
index 9ff2826..990fa7e 100644
--- a/modules/nix-tools/user.nix
+++ b/modules/nix-tools/user.nix
@@ -19,6 +19,7 @@
       home-manager.users."${username}" = {
         imports = [
           self.modules.homeManager."${username}"
+          # self.modules.homeManager.shell-tools
         ];
       };
     };
@@ -26,6 +27,10 @@
     homeManager."${username}" = {
       home.username = "${username}";
       home.homeDirectory = "/home/${username}";
+      # TODO: This doesn't get merged properly when the factory gets used
+      # imports = with self.modules.homeManager; [
+      #   shell-tools
+      # ];
     };
   };
 }
\ No newline at end of file
diff --git a/modules/programs/base.nix b/modules/programs/base.nix
deleted file mode 100644
index 9293c16..0000000
--- a/modules/programs/base.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ inputs, pkgs, ... }:
-{
-  flake.modules.homeManager.base = { pkgs, ... }:
-  {
-    imports = with inputs.self.modules.homeManager; [
-      git
-      shell-tools
-    ];
-  };
-}
\ No newline at end of file
diff --git a/modules/programs/shell-tools.nix b/modules/programs/shell-tools.nix
index a8a56d4..1c7c710 100644
--- a/modules/programs/shell-tools.nix
+++ b/modules/programs/shell-tools.nix
@@ -10,7 +10,7 @@
 
     imports = with inputs.self.modules.homeManager; [
       bash
-      # zsh
+      zsh
 
       # Tools
       eza
diff --git a/modules/users/john.nix b/modules/users/john.nix
index 900eb90..2299099 100644
--- a/modules/users/john.nix
+++ b/modules/users/john.nix
@@ -41,7 +41,9 @@ in
           programs.git.settings.user.email = email;
 
           imports = with inputs.self.modules.homeManager; [
-            base
+            ssh
+            shell-tools
+            git
           ];
         };
       };