diff --git a/hosts/kirsty/system.scm b/hosts/kirsty/system.scm
index 76684c9..3b2500a 100644
--- a/hosts/kirsty/system.scm
+++ b/hosts/kirsty/system.scm
@@ -48,7 +48,7 @@
   (mapped-devices
    (list
     (mapped-device
-     (source "/dev/nvme0n1p2")
+     (source (uuid "c725b7b7-b4d9-49e0-8c2c-3624b3cde7e3"))
      (target "root")
      (type luks-device-mapping))))
 
@@ -60,7 +60,7 @@
       (type "ext4"))
     %base-file-systems))
 
-  (swap-devices '("/swap"))
+  (swap-devices (list (swap-space (target "/swap"))))
 
   (users
    (cons*