diff --git a/config/host-config/nutboy3.nix b/config/host-config/nutboy3.nix
index 732b949..e03e0db 100644
--- a/config/host-config/nutboy3.nix
+++ b/config/host-config/nutboy3.nix
@@ -201,6 +201,8 @@ in {
     containers.cashew = let
       local-packages = with pkgs; [
         bind
+        emacs-nox
+        mtr
         vim
       ];
     in {
diff --git a/config/sites.nix b/config/sites.nix
index 71366a0..c821cee 100644
--- a/config/sites.nix
+++ b/config/sites.nix
@@ -95,5 +95,10 @@
       ];
       mail-server = "mail.fudo.org";
     };
+
+    mobile = {
+      nameservers = [ "1.1.1.1" ];
+      timezone = "America/Los_Angeles";
+    };
   };
 }
diff --git a/flake.nix b/flake.nix
index 9318843..0bc5796 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,13 +12,10 @@
   };
 
   outputs = { self, nixpkgs, fudo-home, fudo-pkgs, fudo-secrets, ... }: {
-
     nixosConfigurations = let
-      lib = nixpkgs.lib;
+      hostlib = import ./lib/hosts.nix { lib = nixpkgs.lib; };
 
-      hostlib = import ./lib/hosts.nix { inherit lib; };
-
-      nixos-hosts = lib.filterAttrs (hostname: hostOpts:
+      nixos-hosts = nixpkgs.lib.filterAttrs (hostname: hostOpts:
         hostOpts.nixos-system) (hostlib.base-host-config ./config/hosts);
 
       build-timestamp = self.sourceInfo.lastModified;
@@ -36,10 +33,8 @@
           (import ./lib/overlay.nix)
         ];
       };
-    in lib.mapAttrs (hostname: hostOpts: let
+    in nixpkgs.lib.mapAttrs (hostname: hostOpts: let
       system = hostOpts.arch;
-      pkgs = pkgs-for system;
-      lib = pkgs.lib;
       site = hostOpts.site;
       domain = hostOpts.domain;
       profile = hostOpts.profile;
@@ -66,6 +61,8 @@
             instance = {
               inherit hostname build-timestamp build-seed;
             };
+
+            nixpkgs.pkgs = pkgs-for system;
           };
         })
       ];