diff --git a/flake.nix b/flake.nix
index d9157a4..6e64bac 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,9 +16,7 @@
         nixpkgs.lib.nixosSystem {
           inherit system;
           modules = [ self.nixosModule ];
-          extraModules = [ ({ ... }: {
-            networking.hostName = name;
-          }) ];
+          specialArgs.hostName = name;
         };
     in
     {
diff --git a/nix/nixos-module/default.nix b/nix/nixos-module/default.nix
index 6be9825..5c42239 100644
--- a/nix/nixos-module/default.nix
+++ b/nix/nixos-module/default.nix
@@ -1,20 +1,20 @@
-{ config, lib, ... }:
+{ hostName, config, lib, pkgs, ... }:
 
 let
-  inherit (config.networking) hostName;
-  inherit (lib) optional;
+  inherit (lib) optionals;
 
   hostConfig = lib.config.site.hosts.${hostName};
 in {
+  site = lib.config.site;
+
   imports = [
-    { config = self.lib.config; }
     ./defaults.nix
     ../lib/config/options.nix
+  ]
+  ++ optionals (hostConfig.role == "server") [
+    #./lxc-containers.nix
+  ]
+  ++ optionals (hostConfig.role == "container") [
+    ./container.nix
   ];
-  # ++ optional (hostConfig.role == "server") [
-  #   #./lxc-containers.nix
-  # ]
-  # ++ optional (hostConfig.role == "container") [
-  #   ./container.nix
-  # ];
 }
diff --git a/nix/nixos-module/defaults.nix b/nix/nixos-module/defaults.nix
index 99d47af..d4f60cc 100644
--- a/nix/nixos-module/defaults.nix
+++ b/nix/nixos-module/defaults.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ hostName, pkgs, ... }:
 
 {
   nix = {
@@ -9,4 +9,6 @@
   environment.systemPackages = with pkgs; [
     vim tcpdump iputils mtr traceroute
   ];
+
+  networking.hostName = hostName;
 }