diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 4b8cd26..a94dfe3 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -14,6 +14,19 @@
 (straight-use-package 'use-package)
 (setq straight-use-package-by-default t)
 
+(use-package emacs
+  :straight (:type built-in)
+  :bind (("C-z" . nil)
+         ("C-z i" . (lambda () (interactive) (find-file user-init-file))))
+  :config
+  (defalias 'yes-or-no-p 'y-or-n-p)
+  (put 'dired-find-alternate-file 'disabled nil)
+  (set-default-file-modes #o750)
+  (windmove-default-keybindings 'super)
+  :custom
+  (column-number-mode t)
+  (inhibit-startup-screen t))
+
 (use-package better-defaults
   :straight (:host nil :repo "https://git.sr.ht/~technomancy/better-defaults"))
 
@@ -34,12 +47,3 @@
 (use-package material-theme
   :config
   (load-theme 'material t))
-
-(put 'dired-find-alternate-file 'disabled nil)
-(defalias 'yes-or-no-p 'y-or-n-p)
-(set-default-file-modes #o750)
-(setq column-number-mode t)
-(setq inhibit-startup-screen t)
-
-(global-unset-key (kbd "C-z"))
-(global-set-key (kbd "C-z i") (lambda () (interactive) (find-file user-init-file)))