diff --git a/flake.nix b/flake.nix
index cb2830b..029f433 100644
--- a/flake.nix
+++ b/flake.nix
@@ -59,41 +59,17 @@
         )
       ) ++ [(self: super: customPackages super)]
         ++ [inputs.neovim-nightly.overlay];
-
-      base = if !(self ? rev) then throw "Dirty git tree detected." else
-      { config, ... }: {
-        system = {
-          configurationRevision = self.rev;
-          nixos = rec {
-            version = config.system.nixos.release + versionSuffix;
-            versionSuffix = "-${config.system.name}.r${builtins.toString self.revCount}.${self.shortRev}";
-            #versionSuffix = ".${nixpkgs.lib.substring 0 8 (nixpkgs.lastModifiedDate or nixpkgs.lastModified or "19700101")}.r${revCount}-${nixpkgs.lib.substring 0 11 (nixpkgs.rev or "dirty")}";
-          };
-        };
-        nix.registry.nixpkgs.flake = nixpkgs;
-        nixpkgs.overlays = overlays;
-
-        home-manager = {
-          useGlobalPkgs = true;
-          useUserPackages = true;
-          extraSpecialArgs = {
-            inherit inputs modules;
-            enableGUI = true;
-          };
-        };
-      };
     in
     {
       nixosConfigurations."winter" = lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
-          base
           home-manager.nixosModules.home-manager
           ./hosts/winter.nix
           secrets.nixosModules.winter
         ];
         specialArgs = {
-          inherit inputs modules;
+          inherit inputs modules overlays;
           enableGUI = true;
         };
       };
diff --git a/hosts/winter.nix b/hosts/winter.nix
index c7823be..19c65c0 100644
--- a/hosts/winter.nix
+++ b/hosts/winter.nix
@@ -17,6 +17,7 @@
     base
     filesystem-winter
     gui
+    gui
     input
     kernel
     kernel-winter
diff --git a/modules/system/base.nix b/modules/system/base.nix
new file mode 100644
index 0000000..1df731f
--- /dev/null
+++ b/modules/system/base.nix
@@ -0,0 +1,20 @@
+{ config, inputs, modules, overlays, ... }: {
+  system = {
+    configurationRevision = inputs.self.rev;
+    nixos = rec {
+      version = config.system.nixos.release + versionSuffix;
+      versionSuffix = "-${config.system.name}.r${builtins.toString inputs.self.revCount}.${inputs.self.shortRev}";
+    };
+  };
+  nix.registry.nixpkgs.flake = inputs.nixpkgs;
+  nixpkgs.overlays = overlays;
+
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    extraSpecialArgs = {
+      inherit inputs modules;
+      enableGUI = true;
+    };
+  };
+}