diff --git a/home-mods/shell/default.nix b/home-mods/shell/default.nix
index ea15425..e4f27f3 100644
--- a/home-mods/shell/default.nix
+++ b/home-mods/shell/default.nix
@@ -17,7 +17,7 @@ let
     ref = "main";
     rev = "c7392136bed264258c9b8788b14410e1ff06d602";
   };
-  myEmacs = (pkgs.pkgsAMD64Microarchs.znver2.emacsPackagesFor pkgs.emacs-unstable-pgtk).emacsWithPackages (epkgs:
+  myEmacs = (pkgs.emacsPackagesFor pkgs.emacs-unstable-pgtk).emacsWithPackages (epkgs:
     with epkgs; [
       vterm
       treesit-grammars.with-all-grammars
@@ -341,7 +341,7 @@ in
     };
 
     # TODO Disable gui apps & switch to emacs-git instead of pgtk on headless systems
-    packages = with pkgs.pkgsAMD64Microarchs.znver2; [
+    packages = with pkgs; [
       myEmacs
       emacs-lsp-booster
       any-nix-shell
diff --git a/systems/nixos-fw16/default.nix b/systems/nixos-fw16/default.nix
index 3ff9f7a..cdeda39 100644
--- a/systems/nixos-fw16/default.nix
+++ b/systems/nixos-fw16/default.nix
@@ -134,8 +134,8 @@
     # kernelPackages = pkgs.pkgsAMD64Microarchs.znver4.linuxPackages_cachyos;
 
     # 6.14 rc wohooo
-    # kernelPackages = pkgs.linuxPackages_cachyos-rc;
-    kernelPackages = pkgs.pkgsAMD64Microarchs.znver2.linuxPackages_cachyos-rc;
+    kernelPackages = pkgs.linuxPackages_cachyos-rc;
+    # kernelPackages = pkgs.pkgsAMD64Microarchs.znver2.linuxPackages_cachyos-rc;
     # kernelPackages = pkgs.pkgsAMD64Microarchs.znver2.linuxPackages_cachyos;
     # kernelPackages = pkgs.linuxPackages_cachyos;