diff --git a/README.org b/README.org
index 647ec86..f5a4bd2 100644
--- a/README.org
+++ b/README.org
@@ -664,7 +664,6 @@ The file system for this host is a single 24GB =QCOW= file, a format for disk im
   boot.extraModulePackages = [ ];
 
   boot.loader.grub.enable = true;
-  boot.loader.grub.version = 2;
   boot.loader.grub.device = "/dev/sda";
 
   fileSystems."/" =
@@ -754,8 +753,10 @@ Apply some configuration to the default settings:
 {
   services.openssh = {
     enable = true;
-    permitRootLogin = "no";
-    passwordAuthentication = false;
+    settings = {
+      PermitRootLogin = false;
+      PasswordAuthentication = false;
+    };
   };
 }
 #+END_SRC
@@ -941,7 +942,7 @@ inputs.home-manager.nixosModules.home-manager {
   home-manager.useGlobalPkgs = true;
   home-manager.useUserPackages = true;
   home-manager.users.chris = {
-    stateVersion = "23.05";
+    home.stateVersion = "23.05";
     imports = [
       <<module-git>>
       <<module-gpg>>
@@ -1315,7 +1316,7 @@ It's somtimes desirable to have customization that takes effect during Emacs sta
 
 #+NAME: emacs-native-comp-package
 #+BEGIN_SRC nix
-pkgs.emacsNativeComp;
+pkgs.emacs-unstable;
 #+END_SRC
 
 Native Comp, also known as GccEmacs, refers to the ~--with-native-compilation~ configuration option when building [[https://gnu.org/software/emacs/][GNU/Emacs]]. It adds support for compiling [[https://www.gnu.org/software/emacs/manual/html_node/elisp/index.html][Emacs Lisp]] to native code using ~libgccjit~. All of the Emacs Lisp packages shipped with Emacs are native-compiled, providing a noticable performance iomprovement out-of-the-box.
diff --git a/flake.nix b/flake.nix
index 891c569..9a05363 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,7 +30,7 @@
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.users.chris = {
-              stateVersion = "23.05";
+              home.stateVersion = "23.05";
               imports = [
                 ./modules/git.nix
                 ./modules/gpg.nix
diff --git a/hosts/nixos/hardware.nix b/hosts/nixos/hardware.nix
index ae7166a..b003d91 100644
--- a/hosts/nixos/hardware.nix
+++ b/hosts/nixos/hardware.nix
@@ -12,7 +12,6 @@
   boot.extraModulePackages = [ ];
 
   boot.loader.grub.enable = true;
-  boot.loader.grub.version = 2;
   boot.loader.grub.device = "/dev/sda";
 
   fileSystems."/" =
diff --git a/modules/emacs.nix b/modules/emacs.nix
index 30453cd..e6c8826 100644
--- a/modules/emacs.nix
+++ b/modules/emacs.nix
@@ -5,7 +5,7 @@
 let
   myEmacs = pkgs.emacsWithPackagesFromUsePackage {
     config = ../README.org;
-    package = pkgs.emacsNativeComp;
+    package = pkgs.emacs-unstable;
     alwaysEnsure = true;
     alwaysTangle = true;
     extraEmacsPackages = epkgs: [
diff --git a/modules/ssh.nix b/modules/ssh.nix
index a22e871..8abdc79 100644
--- a/modules/ssh.nix
+++ b/modules/ssh.nix
@@ -4,7 +4,9 @@
 {
   services.openssh = {
     enable = true;
-    permitRootLogin = "no";
-    passwordAuthentication = false;
+    settings = {
+      PermitRootLogin = false;
+      PasswordAuthentication = false;
+    };
   };
 }