diff --git a/systems/shinji.scm b/systems/shinji.scm
index d5333fd..3a48ea7 100644
--- a/systems/shinji.scm
+++ b/systems/shinji.scm
@@ -7,18 +7,22 @@
 
   (mapped-devices (list (mapped-device
                           (source (uuid
-                                    "5c5dcb22-62b1-41af-9116-b8fdfba83ca2"))
-                          (target "cryptroot")
+                                    "ad489bfa-4280-44ea-8ad2-60347b516d60"))
+                          (target "root")
                           (type luks-device-mapping))))
 
+  (swap-devices (list (swap-space
+                        (target (uuid
+                                  "57caa02d-8569-43e3-8bf9-09dd6f02b191")))))
+
   (file-systems (cons* (file-system
                          (mount-point "/")
-                         (device "/dev/mapper/cryptroot")
+                         (device "/dev/mapper/root")
                          (type "btrfs")
                          (dependencies mapped-devices))
                        (file-system
                          (mount-point "/boot/efi")
-                         (device (uuid "AD5A-4DF3"
+                         (device (uuid "6F93-6A0B"
                                        'fat32))
                          (type "vfat"))
                        %freya-file-systems)))