diff --git a/config/networks/sea.fudo.org.nix b/config/networks/sea.fudo.org.nix
index b226fb0..9396412 100644
--- a/config/networks/sea.fudo.org.nix
+++ b/config/networks/sea.fudo.org.nix
@@ -1,5 +1,3 @@
-{ config, lib, ... }:
-
 let local-domain = "sea.fudo.org";
 in {
   aliases = {
diff --git a/initialize.nix b/initialize.nix
index 0cc94ce..27b703d 100644
--- a/initialize.nix
+++ b/initialize.nix
@@ -1,9 +1,9 @@
-{ hostname, build-timestamp, ... }:
+{ hostname, site, domain, profile, build-timestamp, ... }:
 { config, lib, pkgs, ... }:
 
 let
   # Get info on this host so we know what to load
-  host-config = import (./. + "/config/hosts/${hostname}.nix");
+  config-dir = ./. + "/config";
 
 in {
   imports = [
@@ -12,16 +12,16 @@ in {
       
     #home-manager-module
 
-    (./. + "/config/hardware/${hostname}.nix")
-    (./. + "/config/host-config/${hostname}.nix")
-    (./. + "/config/profile-config/${host-config.profile}.nix")
-    (./. + "/config/domain-config/${host-config.domain}.nix")
-    (./. + "/config/site-config/${host-config.site}.nix")
+    (config-dir + /hardware/${hostname}.nix)
+    (config-dir + /host-config/${hostname}.nix)
+    (config-dir + /profile-config/${profile}.nix)
+    (config-dir + /domain-config/${domain}.nix)
+    (config-dir + /site-config/${site}.nix)
   ];
 
   config = {
     instance = {
-      inherit hostname build-timestamp;
+      inherit hostname site domain profile build-timestamp;
     };
 
     nixpkgs.pkgs = pkgs;
diff --git a/lib/default.nix b/lib/default.nix
index 7550fd5..ace0f0b 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -6,8 +6,6 @@ with lib; {
     
     ./instance.nix
 
-    # ./fudo-lib.nix
-
     ./fudo/acme-for-hostname.nix
     ./fudo/authentication.nix
     ./fudo/backplane