diff --git a/common/default.nix b/common/default.nix
index 40c6927..1911aea 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -47,9 +47,11 @@
 
   services.openssh = {
     enable = true;
-    permitRootLogin = "no";
-    passwordAuthentication = false;
-    kbdInteractiveAuthentication = false;
+    settings = {
+      PermitRootLogin = "no";
+      PasswordAuthentication = false;
+      KbdInteractiveAuthentication = false;
+    };
   };
   # That way we can't forget to disable the access logs for each individual website
   services.nginx.appendHttpConfig = ''
diff --git a/packages/default.nix b/packages/default.nix
index 3ef40cd..655e309 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -24,14 +24,6 @@ final: prev:
     ];
   };
 
-  dokuwiki = prev.dokuwiki.overrideAttrs (oldAttrs: {
-    installPhase = ''
-      ${oldAttrs.installPhase}
-
-      runHook postInstall
-    '';
-  });
-
   dokuwikiPlugins = {
     tag = final.stdenv.mkDerivation rec {
       name = "tag";
diff --git a/services/dokuwiki.nix b/services/dokuwiki.nix
index aa887e7..7063d0d 100644
--- a/services/dokuwiki.nix
+++ b/services/dokuwiki.nix
@@ -5,10 +5,6 @@
   baseDomain,
   ...
 }: let
-  inherit (builtins) any hasAttr isAttrs isBool isInt isList isString;
-  inherit (lib) boolToString concatMapStringsSep concatStringsSep escapeShellArg flatten mapAttrsToList;
-
-  cfg = config.services.dokuwiki.sites.${dw_domain};
   fpm_pool = "dokuwiki-${dw_domain}";
   fpm_cfg = config.services.phpfpm.pools.${fpm_pool};
   dw_domain = "wiki.${baseDomain}";
@@ -58,7 +54,7 @@ in {
     package = pkgs.dokuwiki.overrideAttrs (oldAttrs: {
       name = "dokuwiki-${dw_domain}-with-acronyms-${oldAttrs.version}";
       postInstall = oldAttrs.postInstall or "" + ''
-          ln -s ${acronyms_file} $out/share/dokuwiki/conf/acronyms.local.conf
+          ln -sf ${acronyms_file} $out/share/dokuwiki/conf/acronyms.local.conf
         '';
     });