diff --git a/configs/default.nix b/configs/default.nix
index 3e1fdbb..67a1bb6 100644
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -139,11 +139,9 @@
         (pkgs.unstable.writers.writeDashBin "niveum-deploy" ''
           NIVEUM_DIR=/home/kfm/prog/git/niveum
 
-          for system in "$@"; do
-            eval $(nix-build --no-out-link "$NIVEUM_DIR/deploy.nix" -A "$system") &
-          done
+          [ $# -eq 1 ] || echo >&2 "Usage: niveum-deploy SYSTEM"
 
-          wait
+          eval $(nix-build --no-out-link "$NIVEUM_DIR/deploy.nix" -A "$1")
         '')
         (pkgs.unstable.writers.writeDashBin "niveum-update" ''
           NIVEUM_DIR=/home/kfm/prog/git/niveum
diff --git a/configs/ssh.nix b/configs/ssh.nix
index 5084525..489a5d8 100644
--- a/configs/ssh.nix
+++ b/configs/ssh.nix
@@ -30,17 +30,17 @@ in {
     enable = true;
     matchBlocks = {
       scardanelli = {
-        hostname = "scardanelli.local";
+        hostname = "scardanelli.r";
         user = "kfm";
         port = sshPort;
       };
       homeros = {
-        hostname = "homeros.local";
+        hostname = "homeros.r";
         user = "kfm";
         port = sshPort;
       };
       catullus = {
-        hostname = "catullus.local";
+        hostname = "catullus.r";
         user = "root";
       };
       menstruation-logs = {
diff --git a/modules/google-drive.nix b/modules/google-drive.nix
index f235568..36b990a 100644
--- a/modules/google-drive.nix
+++ b/modules/google-drive.nix
@@ -16,7 +16,7 @@ in
 
     systemd.services.google-drive = {
       description = "Google Drive synchronisation service";
-      wants = [ "network-online.target" ];
+      wantedBy = [ "network-online.target" ];
       script = ''
         ${pkgs.grive2}/bin/grive -p ${cfg.directory}
       '';
diff --git a/modules/todoist.nix b/modules/todoist.nix
index d2dbb26..72cabbc 100644
--- a/modules/todoist.nix
+++ b/modules/todoist.nix
@@ -24,7 +24,7 @@ in {
 
     systemd.user.services.todoist-sync = {
       enable = cfg.enable;
-      wants = [ "network-online.target" ];
+      wantedBy = [ "network-online.target" ];
       startAt = "*:0/5";
       script = ''${todoist}/bin/todoist sync'';
     };