diff --git a/checks.nix b/checks.nix
index 5964db0..29a2970 100644
--- a/checks.nix
+++ b/checks.nix
@@ -6,6 +6,9 @@
   ...
 }:
 
+let
+  meta = import ./hosts/metadata.nix;
+in
 {
   pre-commit-check = hooks.lib.${system}.run {
     src = ./.;
@@ -39,6 +42,6 @@
   };
 }
 // (builtins.mapAttrs (_n: v: v.config.system.build.toplevel) (
-  lib.filterAttrs (_n: v: v.pkgs.stdenv.hostPlatform.system == system) top.self.nixosConfigurations
+  lib.filterAttrs (n: _v: builtins.any (a: a == system) meta.${n}.arch) top.self.nixosConfigurations
 ))
 // (top.self.packages.${system})
diff --git a/flake.nix b/flake.nix
index 10f67d9..c39dd50 100644
--- a/flake.nix
+++ b/flake.nix
@@ -71,8 +71,6 @@
         charts_overlay
         local_overlay
         packages_overlay
-        top.nurpkgs.overlays.default
-        top.vsext.overlays.default
         top.nixvimunstable.overlays.default
       ];
 
diff --git a/home/default.nix b/home/default.nix
index 09604f5..4a9b169 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -7,11 +7,15 @@ let
   pkgs =
     system:
     (import top.nixunstable {
-      inherit system overlays;
+      inherit system;
       config = {
         allowUnfree = true;
         allowUnfreePredicate = _: true;
       };
+      overlays = overlays ++ [
+        top.nurpkgs.overlays.default
+        top.vsext.overlays.default
+      ];
     });
   user =
     system: host: username:
diff --git a/home/hosts/ivr/default.nix b/home/hosts/ivr/default.nix
index d47e2d7..12c9e31 100644
--- a/home/hosts/ivr/default.nix
+++ b/home/hosts/ivr/default.nix
@@ -23,7 +23,6 @@ in
     development = true;
     gui = true;
     nix.cache = false;
-    pypackage.enable = false;
     vscodium = true;
   };
 
diff --git a/hosts/baseline.nix b/hosts/baseline.nix
index 0e24b86..2c3f2de 100644
--- a/hosts/baseline.nix
+++ b/hosts/baseline.nix
@@ -76,13 +76,6 @@ in
 
     xonsh = {
       enable = true;
-      extraPackages = (
-        ps: with ps; [
-          xonsh-apipenv
-          pkgs.nur.repos.xonsh-xontribs.xonsh-direnv
-          pkgs.nur.repos.xonsh-xontribs.xontrib-vox
-        ]
-      );
     };
 
     ssh = {
diff --git a/hosts/default.nix b/hosts/default.nix
index dd8c224..e45a88a 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -33,7 +33,6 @@ let
         # Imported ones
         top.agenix.nixosModules.default
         hm.nixosModules.home-manager
-        top.nurpkgs.modules.nixos.default
         # Local ones
         ./baseline.nix
         top.self.modules.nixosModule
@@ -62,8 +61,8 @@ in
     system = "aarch64-linux";
   };
   # nix build '.#nixosConfigurations.wsl-aarch.config.system.build.installer'
-  nixos-arm = wsl {
-    name = "wsl";
-    system = "aarch64-linux";
-  };
+  #nixos-arm = wsl {
+  #name = "wsl";
+  #system = "aarch64-linux";
+  #};
 }
diff --git a/hosts/metadata.nix b/hosts/metadata.nix
new file mode 100644
index 0000000..b0a80f9
--- /dev/null
+++ b/hosts/metadata.nix
@@ -0,0 +1,47 @@
+{
+  exodus = {
+    arch = [ "x86_64-linux" ];
+  };
+  genesis = {
+    arch = [ "x86_64-linux" ];
+  };
+  hosea = {
+    arch = [ "x86_64-linux" ];
+  };
+  icdm-root = {
+    arch = [ "x86_64-linux" ];
+  };
+  isaiah = {
+    arch = [ "x86_64-linux" ];
+  };
+  iso = {
+    arch = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
+  };
+  jeremiah = {
+    arch = [ "x86_64-linux" ];
+  };
+  linode = {
+    arch = [ "x86_64-linux" ];
+  };
+  nixos = {
+    arch = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
+  };
+  proxmoxtemplate = {
+    arch = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
+  };
+  vm-gitlab = {
+    arch = [ "x86_64-linux" ];
+  };
+  zeke = {
+    arch = [ "x86_64-linux" ];
+  };
+}
diff --git a/modules/hm/default.nix b/modules/hm/default.nix
index 86ddda1..68ccac8 100644
--- a/modules/hm/default.nix
+++ b/modules/hm/default.nix
@@ -5,7 +5,6 @@
     ./development.nix
     ./gnome.nix
     ./gui.nix
-    ./python.nix
     ./vscodium.nix
     ./xonsh.nix
     ./zed.nix
diff --git a/modules/hm/python.nix b/modules/hm/python.nix
deleted file mode 100644
index 9c67d2f..0000000
--- a/modules/hm/python.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-let
-  cfg = config.greg.pypackage;
-in
-{
-  options.greg.pypackage = {
-    enable = lib.mkOption {
-      description = "Enable installing my Python package here";
-      type = lib.types.bool;
-      default = true;
-    };
-    package = lib.mkOption {
-      description = "Enable Gnome support and settings";
-      type = lib.types.package;
-      default = pkgs.gregpy;
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    home.packages = [ cfg.package ];
-  };
-}
diff --git a/overlays/default.nix b/overlays/default.nix
index ee98dcf..a82f0ad 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,29 +1,6 @@
 _final: prev:
 
-let
-  myPackages =
-    pypackages: with pypackages; [
-      black
-      build
-      ipython
-      mypy
-      pylint
-      python-dateutil
-      pyyaml
-      responses
-      ruamel-yaml
-      setuptools
-      tox
-      typing-extensions
-      virtualenv
-    ];
-
-  myPython = prev.python312.withPackages myPackages;
-
-in
 rec {
-  gregpy = myPython;
-
   ## Testing adding python packages in the correct manner
   pythonPackagesExtensions = (prev.pythonPackagesExtensions or [ ]) ++ [
     (