diff --git a/archiso/airootfs/usr/local/bin/nvidia-module-loader b/archiso/airootfs/usr/local/bin/nvidia-module-loader
index 625e06d..bb56cb5 100755
--- a/archiso/airootfs/usr/local/bin/nvidia-module-loader
+++ b/archiso/airootfs/usr/local/bin/nvidia-module-loader
@@ -4,29 +4,11 @@ if [[ -e /sys/module/nvidia || -e /sys/module/nouveau ]]; then
     exit 0
 fi
 
-# Using "install" in modprobe seems to result in no dependency resolving for
-# modules, so we have to manually set the order in which all modules are loaded
-# at once.
-load_nvidia_modules() {
-    local pkgname="$1"
-
-    # Load some basic dependencies of nvidia modules
-    modprobe video
-    modprobe drm_ttm_helper
-    modprobe drm_kms_helper
-
-    for module in nvidia nvidia-modeset nvidia-drm nvidia-uvm; do
-        modprobe --ignore-install "/usr/share/modules/${pkgname}/${module}.ko.zst"
-    done
-}
-
 # Load compatible version of NVIDIA modules for current hardware
-if chwd --list | awk '{ if($2 == "nouveau" || $2 == "nvidia-dkms-390xx" || $2 == "nvidia-dkms-470xx") f=1 } END {exit (f == 1) ? 0 : 1 }'; then
+if chwd --list | awk '{ if($2 == "nouveau" || $2 == "nvidia-dkms-470xx" || $2 == "nvidia-dkms-580xx") f=1 } END {exit (f == 1) ? 0 : 1 }'; then
     modprobe nouveau
-elif chwd --list | awk '{ if($2 == "nvidia-dkms") f=1 } END {exit (f == 1) ? 0 : 1 }'; then
-    load_nvidia_modules linux-cachyos-lts-nvidia
 elif chwd --list | awk '{ if($2 == "nvidia-open-dkms") f=1 } END {exit (f == 1) ? 0 : 1 }'; then
-    load_nvidia_modules linux-cachyos-lts-nvidia-open
+    modprobe --ignore-install nvidia nvidia-modeset nvidia-drm nvidia-uvm
 fi
 
 # Otherwise, do a fallback to nouveau anyway
diff --git a/archiso/packages_desktop.x86_64 b/archiso/packages_desktop.x86_64
index 27715de..a09cf24 100644
--- a/archiso/packages_desktop.x86_64
+++ b/archiso/packages_desktop.x86_64
@@ -81,7 +81,9 @@ libwnck3
 linux-atm
 linux-cachyos-lts
 linux-cachyos-lts-zfs
+linux-cachyos-lts-nvidia-open
 linux-cachyos
+linux-cachyos-nvidia-open
 linux-cachyos-zfs
 linux-firmware
 linux-firmware-marvell
@@ -116,7 +118,6 @@ noto-fonts-cjk
 nss-mdns
 ntfs-3g
 ntp
-nvidia-module-extractor
 nvidia-utils
 nvme-cli
 occt