diff --git a/justfile b/justfile
index 7d677c0..986b1a6 100644
--- a/justfile
+++ b/justfile
@@ -41,7 +41,7 @@ switch hostname=`hostname -s` target='':
         {{ nixcmd }} run nixpkgs#nixos-rebuild -- switch \
             --flake .#{{ hostname }} \
             --target-host {{ target }} \
-            --use-remote-sudo {{ nix_output_monitor }}
+            --sudo {{ nix_output_monitor }}
     fi
 
 [doc('Use nixos-anywhere to deploy to a remote host')]
diff --git a/modules/desktop/niri.nix b/modules/desktop/niri.nix
index c80419b..a3352ae 100644
--- a/modules/desktop/niri.nix
+++ b/modules/desktop/niri.nix
@@ -44,7 +44,7 @@ in {
           color: #DAD8CE;
           border-bottom: 2px solid #CF6A4C;
         }
-              
+            
         #workspaces button.focused {
           background: #CF6A4C;
           color: #1C1B1A;
@@ -109,7 +109,7 @@ in {
     };
     programs.niri = {
       enable = true;
-      package = inputs.niri.packages."${pkgs.system}".niri-unstable;
+      package = inputs.niri.packages."${pkgs.stdenv.hostPlatform.system}".niri-unstable;
     };
     fireproof.home-manager.programs.niri.settings = {
       prefer-no-csd = true;
@@ -122,7 +122,7 @@ in {
       ];
       xwayland-satellite = {
         enable = true;
-        path = lib.getExe inputs.niri.packages."${pkgs.system}".xwayland-satellite-unstable;
+        path = lib.getExe inputs.niri.packages."${pkgs.stdenv.hostPlatform.system}".xwayland-satellite-unstable;
       };
       environment = {
         NIXOS_OZONE_WL = "1";
diff --git a/modules/homelab/nextcloud.nix b/modules/homelab/nextcloud.nix
index 77a12d6..10646a3 100644
--- a/modules/homelab/nextcloud.nix
+++ b/modules/homelab/nextcloud.nix
@@ -20,7 +20,7 @@ lib.mkIf config.fireproof.homelab.enable {
     };
 
     nextcloud = {
-      package = pkgs.nextcloud31;
+      package = pkgs.nextcloud32;
       enable = true;
       https = true;
       database.createLocally = true;
diff --git a/modules/programs/firefox.nix b/modules/programs/firefox.nix
index fb4b8c6..0891f1e 100644
--- a/modules/programs/firefox.nix
+++ b/modules/programs/firefox.nix
@@ -7,7 +7,7 @@
   pkgs,
   ...
 }: let
-  nur = inputs.nur.legacyPackages.${pkgs.system};
+  nur = inputs.nur.legacyPackages.${pkgs.stdenv.hostPlatform.system};
   extensions = nur.repos.rycee.firefox-addons;
 in {
   config = lib.mkIf config.fireproof.desktop.enable {
diff --git a/modules/programs/git.nix b/modules/programs/git.nix
index 4fe3d23..c89bc22 100644
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@@ -9,13 +9,17 @@
     pre-commit
   ];
 
+  fireproof.home-manager.programs.delta = {
+    enable = true;
+    enableGitIntegration = true;
+  };
+
   fireproof.home-manager.programs.git = {
     enable = true;
 
-    userEmail = "nickolaj@fireproof.website";
-    userName = "Nickolaj Jepsen";
-
-    extraConfig = {
+    settings = {
+      user.email = "nickolaj@fireproof.website";
+      user.name = "Nickolaj Jepsen";
       gpg.format = "ssh";
       gpg.ssh.program = "op-ssh-sign";
       push.autosetupremote = "true";
@@ -24,14 +28,8 @@
       rebase.autoStash = "true";
       rerere.enabled = true;
       init.defaultBranch = "main";
+      alias.fixup = "!git log -n 50 --pretty=format:'%h %s' --no-merges | ${lib.getExe pkgs.fzf} | cut -c -7 | xargs -o git commit --fixup";
     };
-
-    delta.enable = true;
-
-    aliases = {
-      "fixup" = "!git log -n 50 --pretty=format:'%h %s' --no-merges | ${lib.getExe pkgs.fzf} | cut -c -7 | xargs -o git commit --fixup";
-    };
-
     includes = [
       {
         condition = "hasconfig:remote.*.url:git@github.com:Digital-Udvikling/**";
diff --git a/modules/programs/vscode.nix b/modules/programs/vscode.nix
index b6f3676..098e743 100644
--- a/modules/programs/vscode.nix
+++ b/modules/programs/vscode.nix
@@ -9,7 +9,7 @@
 }: let
   vscodePackage = pkgsUnstable.vscode;
 
-  vscode-extensions = inputs.nix-vscode-extensions.extensions.${pkgs.system};
+  vscode-extensions = inputs.nix-vscode-extensions.extensions.${pkgs.stdenv.hostPlatform.system};
   vscodePkgs = vscode-extensions.vscode-marketplace // vscode-extensions.vscode-marketplace-release; # Prefer release over pre-release
 
   mkFormatter = formatter: languages: {
diff --git a/modules/system/ssh.nix b/modules/system/ssh.nix
index 4e2f9e4..78c0837 100644
--- a/modules/system/ssh.nix
+++ b/modules/system/ssh.nix
@@ -27,13 +27,14 @@ in {
     home.file.".ssh/id_ed25519.pub".source = ../../secrets/hosts + ("/" + hostname) + "/id_ed25519.pub";
     programs.ssh = {
       enable = true;
-      forwardAgent = true;
-      serverAliveInterval = 60;
-      serverAliveCountMax = 10;
+      enableDefaultConfig = false;
       matchBlocks =
         {
           "*" = {
             identityFile = "${config.age.secrets.ssh-key.path}";
+            forwardAgent = true;
+            serverAliveInterval = 60;
+            serverAliveCountMax = 10;
           };
           homelab = {
             hostname = "x.nickolaj.com";