diff --git a/modules/users/john.nix b/modules/users/john.nix
index f4a0f37..f668936 100644
--- a/modules/users/john.nix
+++ b/modules/users/john.nix
@@ -3,45 +3,41 @@ let
   username = "john";
 in
 {
-  flake = {
-    meta.users."${username}" = {
-      email = "32917998+jsl12@users.noreply.github.com";
-      name = "John Lancaster";
-      username = "${username}";
-      key = "";
-      keygrip = [
-      ];
-      authorizedKeys = [
-        # "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIAUa4dcg1TWc4pW++uodyhX4eOqrX/QYIxFWtEP7HFJ john@john-pc-ubuntu"
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMOkGLo4N/L3RYvaIZ1FmePlxa1HK0fMciZxKtRhN58F root@janus"
-      ];
-    };
+  flake.meta.users."${username}" = {
+    email = "32917998+jsl12@users.noreply.github.com";
+    name = "John Lancaster";
+    inherit username;
+    key = "";
+    keygrip = [
+    ];
+    authorizedKeys = [
+      # "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIAUa4dcg1TWc4pW++uodyhX4eOqrX/QYIxFWtEP7HFJ john@john-pc-ubuntu"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMOkGLo4N/L3RYvaIZ1FmePlxa1HK0fMciZxKtRhN58F root@janus"
+    ];
+  };
 
-    modules = {
-      nixos."${username}" = {
-        imports = [
-          inputs.home-manager.nixosModules.home-manager
-          (inputs.self.factory.user username true).nixos."${username}"
-        ];
-        users.users."${username}" = {
-          openssh.authorizedKeys.keys = inputs.self.meta.users."${username}".authorizedKeys;
-          extraGroups = [ "docker" ];
-        };
-      };
-
-      homeManager."${username}" = with inputs.self.meta.users."${username}"; {
-        home.stateVersion = "25.11";
-        xdg.enable = true;
-
-        programs.git.settings.user.name = name;
-        programs.git.settings.user.email = email;
-
-        imports = with inputs.self.modules.homeManager; [
-          ssh
-          shell-tools
-          git
-        ];
-      };
+  flake.modules.nixos."${username}" = {
+    imports = [
+      inputs.home-manager.nixosModules.home-manager
+      (inputs.self.factory.user username true).nixos."${username}"
+    ];
+    users.users."${username}" = {
+      openssh.authorizedKeys.keys = inputs.self.meta.users."${username}".authorizedKeys;
+      extraGroups = [ "docker" ];
     };
   };
+
+  flake.modules.homeManager."${username}" = with inputs.self.meta.users."${username}"; {
+    home.stateVersion = "25.11";
+    xdg.enable = true;
+
+    programs.git.settings.user.name = name;
+    programs.git.settings.user.email = email;
+
+    imports = with inputs.self.modules.homeManager; [
+      ssh
+      shell-tools
+      git
+    ];
+  };
 }