diff --git a/modules/services/docker.nix b/modules/services/docker.nix
index 75498b8..727a11b 100644
--- a/modules/services/docker.nix
+++ b/modules/services/docker.nix
@@ -4,12 +4,9 @@
     virtualisation.docker = {
       enable = true;
     };
-    home-manager.sharedModules = [
-      inputs.self.modules.homeManager.docker
+    home-manager.sharedModules = with inputs.self.modules.homeManager; [
+      docker
     ];
-    # users.users.john = {
-    #   extraGroups = [ "docker" ];
-    # };
   };
 
   flake.modules.homeManager.docker = { config, lib, pkgs, ... }:
diff --git a/modules/users/john.nix b/modules/users/john.nix
index 78f31d5..3c67ed0 100644
--- a/modules/users/john.nix
+++ b/modules/users/john.nix
@@ -29,12 +29,12 @@ in
         };
 
         # This gets imported by the user factory: 
-        homeManager."${username}" = {
+        homeManager."${username}" = with inputs.self.meta.users."${username}"; {
           home.stateVersion = "25.11";
           xdg.enable = true;
 
-          programs.git.settings.user.name = "John Lancaster";
-          programs.git.settings.user.email = "32917998+jsl12@users.noreply.github.com";
+          programs.git.settings.user.name = name;
+          programs.git.settings.user.email = email;
 
           # imports = with inputs.self.modules.homeManager; [
           #   # base