diff --git a/system_files/deck/shared/usr/share/ublue-os/just/custom.just b/system_files/deck/shared/usr/share/ublue-os/just/custom.just
index bd96c701..29d13646 100644
--- a/system_files/deck/shared/usr/share/ublue-os/just/custom.just
+++ b/system_files/deck/shared/usr/share/ublue-os/just/custom.just
@@ -54,10 +54,20 @@ get-steamcmd:
   rm /tmp/steamcmd.tar.gz
 
 install-nix:
+  #!/usr/bin/env bash
   curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install
+  nix_systemd_file_location='/nix/var/nix/profiles/default'
+  if (( $EUID != 0 )); then
+      echo "This script must be ran as root"
+      exit 1
+  fi
+  rm -f /etc/systemd/system/nix-daemon.service
+  rm -f /etc/systemd/system/nix-daemon.socket
+  cp $nix_systemd_file_location/lib/systemd/system/nix-daemon.service /etc/systemd/system/nix-daemon.service
+  cp $nix_systemd_file_location/lib/systemd/system/nix-daemon.socket /etc/systemd/system/nix-daemon.socket
 
 remove-nix:
-  curl -s https://raw.githubusercontent.com/dnkmmr69420/nix-installer-scripts/main/uninstaller-scripts/silverblue-nix-uninstaller.sh | bash
+  sudo /nix/nix-installer uninstall
 
 get-greenlight:
   echo 'Retrieving Greenlight'