diff --git a/modules/flake/hosts.nix b/modules/flake/hosts.nix
index d9b5479..2ad0f9b 100644
--- a/modules/flake/hosts.nix
+++ b/modules/flake/hosts.nix
@@ -1,10 +1,11 @@
 { inputs, config, ... }:
 let
   inherit (inputs.nixpkgs) lib;
-  inherit (inputs.self.modules.nixos) desktop server;
+  inherit (inputs.self.modules.nixos) core desktop server;
   cfg = config.local;
   mkHost = sharedModule: name: hostModule: {
     imports = [
+      core
       sharedModule
       hostModule
     ];
diff --git a/modules/hosts/crossbell/default.nix b/modules/hosts/crossbell/default.nix
index 6bbc32b..5431bc7 100644
--- a/modules/hosts/crossbell/default.nix
+++ b/modules/hosts/crossbell/default.nix
@@ -20,8 +20,6 @@ in
       };
       swapDevices = [ { device = "/dev/disk/by-label/swap"; } ];
 
-      time.timeZone = "America/New_York";
-
       users.users.root.openssh.authorizedKeys.keys = [
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHwIv6+ZEHCVNmIS1vfUO+bqIP2y3hv3h/AzzmvTQ3HI"
       ];
diff --git a/modules/incus/containers.nix b/modules/incus/containers.nix
index d3628e1..0ad70c1 100644
--- a/modules/incus/containers.nix
+++ b/modules/incus/containers.nix
@@ -10,6 +10,7 @@
 
       security.sudo.wheelNeedsPassword = false;
 
+      networking.useHostResolvConf = false;
       networking.firewall.allowedTCPPorts = [ 22 ];
       boot.kernel.sysctl."net.ipv4.ip_unprivileged_port_start" = 80;
     };
diff --git a/modules/nixos/imports.nix b/modules/nixos/imports.nix
index 7ecc2b4..9cf13ed 100644
--- a/modules/nixos/imports.nix
+++ b/modules/nixos/imports.nix
@@ -15,27 +15,14 @@ in
       inputs.disko.nixosModules.disko
     ];
 
-    container.imports = [
-      base
-    ];
-
     desktop.imports = [
-      core
       yggdrasilClient
       inputs.srvos.nixosModules.desktop
     ];
 
-    server.imports = [
-      core
-      yggdrasilGateway
-      inputs.srvos.nixosModules.server
+    container.imports = [
+      base
+      server
     ];
-
-    # override srvos
-    server.programs.vim = {
-      enable = false;
-      defaultEditor = false;
-    };
-    server.hardware.facter.detected.graphics.enable = false;
   };
 }
diff --git a/modules/nixos/nixos.nix b/modules/nixos/nixos.nix
index e3dcf49..676cb36 100644
--- a/modules/nixos/nixos.nix
+++ b/modules/nixos/nixos.nix
@@ -1,4 +1,8 @@
 {
+  flake.modules.nixos.base = {
+    time.timeZone = "America/New_York";
+  };
+
   flake.modules.nixos.core =
     { lib, pkgs, ... }:
     {
@@ -16,8 +20,6 @@
         util-linux
       ];
 
-      time.timeZone = lib.mkDefault "America/New_York";
-
       security.sudo.wheelNeedsPassword = false;
 
       programs.ssh.startAgent = true;
diff --git a/modules/nixos/yggdrasil/hosts.nix b/modules/nixos/yggdrasil/hosts.nix
index 3947aae..ad59165 100644
--- a/modules/nixos/yggdrasil/hosts.nix
+++ b/modules/nixos/yggdrasil/hosts.nix
@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ self, lib, ... }:
 let
   hosts = {
     grancel = {
@@ -36,4 +36,6 @@ in
 
   flake.modules.nixos.yggdrasilGateway.services.yggdrasil.settings.AllowedPublicKeys =
     map (builtins.getAttr "publicKey") (builtins.attrValues hosts);
+
+  local.servers.crossbell.imports = [ self.modules.nixos.yggdrasilGateway ];
 }
diff --git a/modules/server.nix b/modules/server.nix
new file mode 100644
index 0000000..c3eb9de
--- /dev/null
+++ b/modules/server.nix
@@ -0,0 +1,14 @@
+{ inputs, ... }:
+{
+  flake.modules.nixos.server = {
+    imports = [ inputs.srvos.nixosModules.server ];
+
+    hardware.facter.detected.graphics.enable = false;
+
+    # override srvos
+    programs.vim = {
+      enable = false;
+      defaultEditor = false;
+    };
+  };
+}