diff --git a/hosts/amy/configuration.nix b/hosts/amy/configuration.nix
index f208a5a..90c9165 100644
--- a/hosts/amy/configuration.nix
+++ b/hosts/amy/configuration.nix
@@ -2,11 +2,31 @@
   imports = [
     ./hardware-configuration.nix
     ../../common/generic.nix
+    ../../common/server.nix
+    ../../common/tailscale.nix
   ];
 
   zramSwap.enable = true;
   networking.hostName = "amy";
   networking.domain = "serv.ashhhleyyy.dev";
+
+  time.timeZone = "Europe/London";
+
+  i18n.defaultLocale = "en_GB.UTF-8";
+
+  services.xserver = {
+    layout = "gb";
+    xkbVariant = "";
+  };
+
+  console.keyMap = "uk";
+
+  nix.settings.trusted-users = [ "@wheel" ];
+
+  nixpkgs.config.allowUnfree = true;
+
   services.openssh.enable = true;
+  networking.firewall.allowedTCPPorts = [ 22 ];
+
   system.stateVersion = "23.11";
 }
diff --git a/hosts/lea/configuration.nix b/hosts/lea/configuration.nix
index f9179b9..540655a 100644
--- a/hosts/lea/configuration.nix
+++ b/hosts/lea/configuration.nix
@@ -4,7 +4,6 @@
   imports =
     [
       ./hardware-configuration.nix
-      ../../common/cachix.nix
       ../../common/generic.nix
       ../../common/server.nix
       ../../common/tailscale.nix
@@ -38,7 +37,6 @@
   nixpkgs.config.allowUnfree = true;
 
   environment.systemPackages = with pkgs; [
-    helix
     smartmontools
   ];