diff --git a/flake.nix b/flake.nix
index 1694ab1..7590181 100644
--- a/flake.nix
+++ b/flake.nix
@@ -40,6 +40,7 @@
     in
     {
       # Custom nixosModules
+      nixosModules.base = import ./modules/base;
       nixosModules.macos = import ./modules/macos;
       nixosModules.homebrew = import ./modules/homebrew;
       nixosModules.aerospace = import ./modules/aerospace;
@@ -54,33 +55,19 @@
       nixosModules.steam = import ./modules/steam;
       nixosModules.niriSystem = import ./modules/wm/niri-system;
 
-      # Overlays
-      overlays.default = final: prev: {
-        python3 = prev.python3.override {
-          packageOverrides = pyFinal: pyPrev: {
-            python-dbusmock = pyPrev.python-dbusmock.overridePythonAttrs (_: {
-              doCheck = false;
-            });
-          };
-        };
-      };
-
       nixosConfigurations.dnsc-machine = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         specialArgs = { inherit inputs outputs; };
-        pkgs = import nixpkgs {
-          system = "x86_64-linux";
-          overlays = [
-            self.overlays.default
-            inputs.zellij-switch.overlays.default
-          ];
-          config = {
-            allowUnfree = true;
-            allowUnsupportedSystem = true;
-          };
-        };
         modules = [
           ./hosts/dnsc-machine
+          {
+            nixpkgs.overlays = [
+              inputs.zellij-switch.overlays.default
+              (final: prev: {
+                networkmanager = inputs.nixpkgs-backport-fix.legacyPackages.x86_64-linux.networkmanager;
+              })
+            ];
+          }
         ];
       };