diff --git a/provision/nixos/hosts/kestrel/flake.lock b/provision/nixos/flake.lock
similarity index 100%
rename from provision/nixos/hosts/kestrel/flake.lock
rename to provision/nixos/flake.lock
diff --git a/provision/nixos/hosts/kestrel/flake.nix b/provision/nixos/flake.nix
similarity index 54%
rename from provision/nixos/hosts/kestrel/flake.nix
rename to provision/nixos/flake.nix
index 56180992..a15e1942 100644
--- a/provision/nixos/hosts/kestrel/flake.nix
+++ b/provision/nixos/flake.nix
@@ -1,5 +1,5 @@
 {
-  description = "Flake for kestrel configuration";
+  description = "Flake for nixos configurations";
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
@@ -24,14 +24,31 @@
           inherit system;
           specialArgs = { inherit user; };
           modules = [
-            ./configuration.nix
-            ./hardware.nix
+            ./hosts/kestrel/configuration.nix
+            ./hosts/kestrel/hardware.nix
             home-manager.nixosModules.home-manager {
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
               home-manager.extraSpecialArgs = { inherit user; };
               home-manager.users.${user} = {
-                imports = [ ./home-configuration.nix ];
+                imports = [ ./hosts/kestrel/home-configuration.nix ];
+              };
+            }
+          ];
+        };
+
+        torus = lib.nixosSystem {
+          inherit system;
+          specialArgs = { inherit user; };
+          modules = [
+            ./hosts/torus/configuration.nix
+            ./hosts/torus/hardware.nix
+            home-manager.nixosModules.home-manager {
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+              home-manager.extraSpecialArgs = { inherit user; };
+              home-manager.users.${user} = {
+                imports = [ ./hosts/torus/home-configuration.nix ];
               };
             }
           ];
diff --git a/provision/nixos/hosts/torus/configuration.nix b/provision/nixos/hosts/torus/configuration.nix
index 08a2a3c5..92154561 100644
--- a/provision/nixos/hosts/torus/configuration.nix
+++ b/provision/nixos/hosts/torus/configuration.nix
@@ -16,22 +16,15 @@
   nixpkgs.config.allowUnfree = true;
   nixpkgs.overlays = import ../../lib/overlays.nix;
 
-  # Use zen kernel
-  boot.kernelPackages = pkgs.linuxPackages_zen;
-
-  # Hardware options
-  hardware.bluetooth.enable = true;
-  hardware.sensor.iio.enable = true;
-  hardware.opengl.enable = true;
-  hardware.opengl.driSupport = true;
-  hardware.opengl.driSupport32Bit = true;
+  # Use normal kernel
+  boot.kernelPackages = pkgs.linuxPackages;
 
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
   # Set networking options
-  networking.hostName = "kestrel"; 
+  networking.hostName = "torus"; 
   networking.networkmanager.enable = true;  
   networking.firewall.checkReversePath = "loose";
 
@@ -39,16 +32,6 @@
   time.timeZone = "America/Los_Angeles";
   i18n.defaultLocale = "en_US.UTF-8";
 
-  # Enable sound.
-  sound.enable = true;
-  hardware.pulseaudio.enable = true;
-  hardware.pulseaudio.support32Bit = true;
-
-  # Add fonts
-  fonts.fonts = with pkgs; [
-    nerdfonts
-  ];
-
   # Enable virtualisation
   virtualisation.docker.enable = true;
   virtualisation.docker.storageDriver = "btrfs";
@@ -79,17 +62,9 @@
 
   # Enable user services
   services = {
-    gvfs.enable = true; # USB automount
-    blueman.enable = true;
-    printing.enable = true;
-    printing.drivers = [ pkgs.hplip ];
-    avahi.enable = true;
-    avahi.nssmdns = true;
     syncthing = {
       enable = true;
       user = "${user}";
-      dataDir = "/home/${user}/sync";
-      configDir = "/home/${user}/.config/syncthing";
     };
   };
 
@@ -108,17 +83,6 @@
     services = {
       samba.enable = true;
     };
-    devel = {
-      tooling.enable = true;
-      python.enable = true;
-      engineering.enable = true;
-    };
-    gaming = {
-      steam.enable = true;
-    };
-    desktop = {
-      sway.enable = true;
-    };
   };
   
   system.stateVersion = "23.05"; # Did you read the comment?
diff --git a/provision/nixos/hosts/torus/flake.lock b/provision/nixos/hosts/torus/flake.lock
deleted file mode 100644
index 1aa2ea43..00000000
--- a/provision/nixos/hosts/torus/flake.lock
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "nodes": {
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1687871164,
-        "narHash": "sha256-bBFlPthuYX322xOlpJvkjUBz0C+MOBjZdDOOJJ+G2jU=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "07c347bb50994691d7b0095f45ebd8838cf6bc38",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-23.05",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1688939073,
-        "narHash": "sha256-jYhYjeK5s6k8QS3i+ovq9VZqBJaWbxm7awTKNhHL9d0=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "8df7a67abaf8aefc8a2839e0b48f92fdcf69a38b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-23.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/provision/nixos/hosts/torus/flake.nix b/provision/nixos/hosts/torus/flake.nix
deleted file mode 100644
index 56180992..00000000
--- a/provision/nixos/hosts/torus/flake.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  description = "Flake for kestrel configuration";
-
-  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
-    home-manager = {
-      url = github:nix-community/home-manager/release-23.05;
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-  };
-
-  outputs = inputs @ { self, nixpkgs, home-manager, ... }:
-    let
-      system = "x86_64-linux";
-      pkgs = import nixpkgs {
-        inherit system;
-        config.allowUnfree = true;
-      };
-      lib = nixpkgs.lib;
-      user = "tstarr";
-    in {
-      nixosConfigurations = {
-        kestrel = lib.nixosSystem {
-          inherit system;
-          specialArgs = { inherit user; };
-          modules = [
-            ./configuration.nix
-            ./hardware.nix
-            home-manager.nixosModules.home-manager {
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
-              home-manager.extraSpecialArgs = { inherit user; };
-              home-manager.users.${user} = {
-                imports = [ ./home-configuration.nix ];
-              };
-            }
-          ];
-        };
-      };
-    };
-}
diff --git a/provision/nixos/hosts/torus/home-configuration.nix b/provision/nixos/hosts/torus/home-configuration.nix
index 05e3b652..c39bde6b 100644
--- a/provision/nixos/hosts/torus/home-configuration.nix
+++ b/provision/nixos/hosts/torus/home-configuration.nix
@@ -7,7 +7,6 @@
   home.packages = with pkgs; [
     chezmoi
     rbw 
-    zk
   ];
 
   home.stateVersion = "23.05";