diff --git a/flake.nix b/flake.nix
index 015c293..17dc2d0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,8 +23,7 @@
           modules = [
             ./nixosModules # TODO: move to base
             ./hosts/work-ntb
-            inputs.nix-flatpak.nixosModules.nix-flatpak # TODO: move to base
-            inputs.home-manager.nixosModules.home-manager # TODO: move to base
+            ./hosts/base
           ];
           specialArgs = {
             hostname = "work-ntb";
diff --git a/hosts/base/default.nix b/hosts/base/default.nix
index aeee15d..d31db67 100644
--- a/hosts/base/default.nix
+++ b/hosts/base/default.nix
@@ -5,21 +5,20 @@
 {
   config,
   pkgs,
-  hostname,
   ...
-}:
+}@extraInputs:
 
 {
+
   imports = [
-    # Include the results of the hardware scan.
-    ../${hostname}/hardware-configuration.nix
+    extraInputs.inputs.nix-flatpak.nixosModules.nix-flatpak # TODO: move to base
+    extraInputs.inputs.home-manager.nixosModules.home-manager # TODO: move to base
   ];
 
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  networking.hostName = hostname; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant. Not needed if using GNOME
 
   # Configure network proxy if necessary
diff --git a/hosts/work-ntb/default.nix b/hosts/work-ntb/default.nix
index cb0799c..fdf1835 100644
--- a/hosts/work-ntb/default.nix
+++ b/hosts/work-ntb/default.nix
@@ -6,12 +6,12 @@
 }:
 {
   imports = [
-    (import ../base {
-      inherit config pkgs;
-      hostname = "work-ntb";
-    })
+    # Include the results of the hardware scan.
+    ./hardware-configuration.nix
   ];
 
+  networking.hostName = "work-ntb"; # Define your hostname.
+
   # My own modules configuration
   krop = {
     ide = {