diff --git a/flake.nix b/flake.nix
index 6906103..dc12d21 100644
--- a/flake.nix
+++ b/flake.nix
@@ -85,10 +85,12 @@
     };
 
     nixosConfigurations = let
-      homeModule = {
+      baseHomeModule = {
         home-manager.useGlobalPkgs = true;
         home-manager.useUserPackages = true;
         home-manager.extraSpecialArgs = {inherit inputs;};
+      };
+      homeModule = baseHomeModule // {
         home-manager.users.michael = import ./user/environments/nixos/home.nix;
       };
     in {
@@ -155,7 +157,10 @@
           defaultModules
           ++ [
             ./modules/nix.nix
-            homeModule
+            baseHomeModule
+            {
+              home-manager.users.michael = import ./user/environments/nixos-server/home.nix;
+            }
             agenix.nixosModules.default
             {
               environment.systemPackages = [
@@ -191,9 +196,8 @@
         modules = [
           self.overlaysModule
           home-manager.darwinModules.home-manager
+          baseHomeModule
           {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
             home-manager.users.michael = import ./user/environments/mac/home.nix;
           }