diff --git a/flake.nix b/flake.nix
index 3e28c00..47f178a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -179,17 +179,5 @@
       };
 
       nixosModules.qbittorrent = import ./modules/qbittorrent.nix;
-
-      packages.x86_64-linux = {
-        install-iso = nixos-generators.nixosGenerate {
-          system = "x86_64-linux";
-          modules = [{
-            users.users.nixos.openssh.authorizedKeys.keys = [
-              "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKcwF1yuWEfYGScNocEbs0AmGxyTIzGc4/IhpU587SJE"
-            ];
-          }];
-          format = "install-iso";
-        };
-      };
     };
 }
diff --git a/hosts/common/boot.nix b/hosts/common/boot.nix
index 6fa4e01..f50b7dc 100644
--- a/hosts/common/boot.nix
+++ b/hosts/common/boot.nix
@@ -8,7 +8,6 @@
       systemd-boot = {
         enable = true;
         editor = false;
-        sortKey = "a_nixos";
         netbootxyz.enable = true;
       };
     };
diff --git a/hosts/desktops/common/boot.nix b/hosts/desktops/common/boot.nix
index 3ee00d3..111fec5 100644
--- a/hosts/desktops/common/boot.nix
+++ b/hosts/desktops/common/boot.nix
@@ -8,7 +8,10 @@
       theme = "colorful_sliced";
     };
     initrd.systemd.enable = true;
-    loader.efi.efiSysMountPoint = "/boot/efi";
+    loader = {
+      efi.efiSysMountPoint = "/boot/efi";
+      systemd-boot.sortKey = "a_nixos";
+    };
     kernelPackages = pkgs.linuxPackages_xanmod_latest;
     extraModprobeConfig = ''
       options bluetooth disable_ertm=1
diff --git a/hosts/desktops/io.nix b/hosts/desktops/io.nix
index 0d8ff5b..4c3f753 100644
--- a/hosts/desktops/io.nix
+++ b/hosts/desktops/io.nix
@@ -27,10 +27,34 @@
   };
 
   environment = {
-    systemPackages = with pkgs; [ alsa-ucm-conf maliit-keyboard ];
-    sessionVariables = {
-      ALSA_CONFIG_UCM2 = "${pkgs.alsa-ucm-conf}/share/alsa/ucm2";
-    };
+    systemPackages = with pkgs; [ maliit-keyboard ];
+    sessionVariables.ALSA_CONFIG_UCM2 = let
+      cml-ucm-conf = pkgs.alsa-ucm-conf.overrideAttrs {
+        wttsrc = pkgs.fetchurl {
+          url =
+            "https://github.com/WeirdTreeThing/chromebook-ucm-conf/archive/2b2f3a7c993fd38a24aa81394e29ee530b890658.tar.gz";
+          hash = "sha256-WeLkxWB174Hwb11xnIxsvRm5NpM528IVEYH4K32pLwg=";
+        };
+        unpackPhase = ''
+          runHook preUnpack
+          tar xf "$src"
+          tar xf "$wttsrc"
+          runHook postUnpack
+        '';
+        installPhase = ''
+          runHook preInstall
+          mkdir -p $out/share/alsa
+          cp -r alsa-ucm*/{ucm,ucm2} $out/share/alsa
+          cp -r chromebook-ucm*/common $out/share/alsa/ucm2/common
+          cp -r chromebook-ucm*/codecs $out/share/alsa/ucm2/codecs
+          cp -r chromebook-ucm*/platforms $out/share/alsa/ucm2/platforms
+          cp -r chromebook-ucm*/sof-rt5682 $out/share/alsa/ucm2/conf.d/sof-rt5682
+          cp -r chromebook-ucm*/sof-cs42l42 $out/share/alsa/ucm2/conf.d/sof-cs42l42
+          cp -r chromebook-ucm*/cml/* $out/share/alsa/ucm2/conf.d
+          runHook postInstall
+        '';
+      };
+    in "${cml-ucm-conf}/share/alsa/ucm2";
   };
   services.keyd = {
     enable = true;
@@ -79,26 +103,31 @@
     };
   };
 
-  # nixpkgs.overlays = with pkgs;
-  #   [
-  #     (final: prev: {
-  #       alsa-ucm-conf = prev.alsa-ucm-conf.overrideAttrs (old: {
-  #         wttsrc = (fetchFromGitHub {
-  #           owner = "WeirdTreeThing";
-  #           repo = "chromebook-ucm-conf";
-  #           rev = "484f5c581ac45c4ee6cfaf62bdecedfa44353424";
-  #           hash = "sha256-Jal+VfxrPSAPg9ZR+e3QCy4jgSWT4sSShxICKTGJvAI=";
-  #         });
-
-  #         installPhase = ''
-  #           runHook preInstall
-  #           mkdir -p $out/share/alsa
-  #           cp -r ucm ucm2 $out/share/alsa
-  #           mkdir -p $out/share/alsa/ucm2/conf.d
-  #           cp -r $wttsrc/{hdmi,dmic}-common $wttsrc/tgl/* $out/share/alsa/ucm2/conf.d
-  #           runHook postInstall
-  #         '';
-  #       });
-  #     })
-  #   ];
+  # nixpkgs.overlays = [
+  #   (self: super: {
+  #     alsa-ucm-conf = super.alsa-ucm-conf.override {
+  #       src2 = pkgs.fetchurl {
+  #         url =
+  #           "https://github.com/WeirdTreeThing/chromebook-ucm-conf/archive/792a6d5ef0d70ac1f0b4861f3d29da4fe9acaed1.tar.gz";
+  #         hash = "";
+  #       };
+  #       unpackPhase = ''
+  #         runHook preUnpack
+  #         tar xf "$src"
+  #         tar xf "$src2"
+  #         runHook postUnpack
+  #       '';
+  #       installPhase = ''
+  #         runHook preInstall
+  #         mkdir -p $out/share/alsa
+  #         cp -r alsa-ucm*/ucm alsa-ucm*/ucm2 $out/share/alsa
+  #         cp -r chromebook-ucm*/hdmi-common \
+  #               chromebook-ucm*/dmic-common \
+  #               chromebook-ucm*/cml/* \
+  #               $out/share/alsa/ucm2/conf.d
+  #         runHook postInstall
+  #       '';
+  #     };
+  #   })
+  # ];
 }