diff --git a/flake.nix b/flake.nix
index a8aef53..cf2eabb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,13 +21,10 @@
         work-ntb = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           modules = [
-            ./nixosModules # TODO: move to base
             ./hosts/work-ntb
             ./hosts/base
           ];
-        };
-        extraSpecialArgs = {
-          inherit (inputs) home-manager nix-flatpak;
+          specialArgs = { inherit inputs; };
         };
       };
       formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style;
diff --git a/hosts/base/default.nix b/hosts/base/default.nix
index bb1eebe..eef5204 100644
--- a/hosts/base/default.nix
+++ b/hosts/base/default.nix
@@ -5,26 +5,25 @@
 {
   config,
   pkgs,
+  inputs,
   ...
-}@inputs:
+}:
 
 {
 
   imports = [
-    inputs.nix-flatpak.nixosModules.nix-flatpak # TODO: move to base
     inputs.home-manager.nixosModules.home-manager # TODO: move to base
+    inputs.nix-flatpak.nixosModules.nix-flatpak # TODO: move to base
+    ../../nixosModules
   ];
 
   # Bootloader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
+  boot.loader = {
+    systemd-boot.enable = true;
+    efi.canTouchEfiVariables = true;
+  };
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant. Not needed if using GNOME
 
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
   # Enable networking
   networking.networkmanager.enable = true;
 
@@ -47,11 +46,13 @@
   };
 
   # Enable the X11 windowing system.
-  services.xserver.enable = true;
-
-  # Enable the GNOME Desktop Environment.
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
+  services.xserver = {
+    enable = true;
+    # Enable the GNOME Desktop Environment.
+    displayManager.gdm.enable = true;
+    desktopManager.gnome.enable = true;
+  };
+  
   services.gnome.gnome-browser-connector.enable = true;
 
   environment.gnome.excludePackages = with pkgs; [