diff --git a/configuration/hardware-specific/linode/default.nix b/configuration/hardware-specific/linode/default.nix
index 7d6a780..3cd3570 100644
--- a/configuration/hardware-specific/linode/default.nix
+++ b/configuration/hardware-specific/linode/default.nix
@@ -1,4 +1,8 @@
 {
+  imports = [
+    ./hardware-configuration.nix
+  ];
+
   # Required for the lish console
   boot.kernelParams = ["console=ttyS0,19200n8"];
 
diff --git a/configuration/services/nextcloud.nix b/configuration/services/nextcloud.nix
index 5186131..ce43280 100644
--- a/configuration/services/nextcloud.nix
+++ b/configuration/services/nextcloud.nix
@@ -27,6 +27,62 @@ in {
       defaultPhoneRegion = "AT";
     };
 
+    extraApps = {
+      # TODO(tlater): Seems like this won't work anymore from
+      # Nextcloud 25 onwards.
+      #
+      # Adopt whatever upstream does with this:
+      # https://github.com/nextcloud/server/issues/4917
+      apporder = pkgs.fetchNextcloudApp {
+        name = "apporder";
+        url = "https://github.com/juliushaertl/apporder/releases/download/v0.15.0/apporder.tar.gz";
+        version = "0.15.0";
+        sha256 = "sha256-p3VWxTYDCO2NePq6oLM8tBVqYkvoB7itqxp7IZwGDnE=";
+      };
+
+      bookmarks = pkgs.fetchNextcloudApp {
+        name = "bookmarks";
+        url = "https://github.com/nextcloud/bookmarks/releases/download/v11.0.4/bookmarks-11.0.4.tar.gz";
+        version = "11.0.4";
+        sha256 = "sha256-URqtzaCx8FEZHCDP1wSBUFNs+x50jesRtWi+xOU1oXM=";
+      };
+
+      calendar = pkgs.fetchNextcloudApp {
+        name = "calendar";
+        url = "https://github.com/nextcloud-releases/calendar/releases/download/v3.5.0/calendar-v3.5.0.tar.gz";
+        version = "3.5.0";
+        sha256 = "sha256-+LRGl9h40AQdWN9SW+NqGwTafAGwV07Af8nVs3pUCm0=";
+      };
+
+      contacts = pkgs.fetchNextcloudApp {
+        name = "contacts";
+        url = "https://github.com/nextcloud-releases/contacts/releases/download/v4.2.2/contacts-v4.2.2.tar.gz";
+        version = "4.2.2";
+        sha256 = "sha256-GTiyZsUHBXPgQ17DHAihmt2W/ZnAjDwfgwnujkRwk6A=";
+      };
+
+      cookbook = pkgs.fetchNextcloudApp {
+        name = "cookbook";
+        url = "https://github.com/nextcloud/cookbook/releases/download/v0.9.15/Cookbook-0.9.15.tar.gz";
+        version = "0.9.15";
+        sha256 = "sha256-v64rLGyMQOdStyivpJsKrNxwumVQvyK3CnHtZ+K+elE=";
+      };
+
+      news = pkgs.fetchNextcloudApp {
+        name = "news";
+        url = "https://github.com/nextcloud/news/releases/download/18.2.0/news.tar.gz";
+        version = "18.2.0";
+        sha256 = "sha256-eS0cFwJmYfGGJmA02AOWO/OXfqfyI71u2GataDj18DE=";
+      };
+
+      notes = pkgs.fetchNextcloudApp {
+        name = "notes";
+        url = "https://github.com/nextcloud/notes/releases/download/v4.5.1/notes.tar.gz";
+        version = "4.5.1";
+        sha256 = "sha256-rd3uVkVtARX4enRAWm1ivV468lboYZnYe7/zsqaHYpk=";
+      };
+    };
+
     # TODO(tlater): Add redis config. This will be much easier
     # starting with 22.11, since this will add an `extraOptions` where
     # the necessary redis config can go.
diff --git a/flake.nix b/flake.nix
index 56caaaa..ec91b53 100644
--- a/flake.nix
+++ b/flake.nix
@@ -66,12 +66,14 @@
 
       profiles.system = {
         user = "root";
-        path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.tlaternet;
+        path = deploy-rs.lib.${system}.activate.nixos self.nixosConfigurations.tlaternet;
       };
 
       sshUser = "tlater";
-      sshOpts = ["-p" "2222"];
+      sshOpts = ["-t" "-p" "2222"];
       fastConnection = true;
+      # Currently broken, see https://github.com/serokell/deploy-rs/issues/78
+      magicRollback = false;
     };
 
     #########
@@ -118,18 +120,13 @@
         nativeBuildInputs = [
           sops-import-keys-hook
         ];
+
         packages = with pkgs; [
           nixfmt
           git-lfs
           sops-init-gpg-key
           deploy-rs-bin
         ];
-
-        shellHook = ''
-          # Work around sudo requiring a full terminal when deploying to
-          # a remote host
-          export NIX_SSHOPTS="-t"
-        '';
       };
   };
 }