diff --git a/modules/module-org.el b/modules/module-org.el
index 209532d59..da9368f89 100644
--- a/modules/module-org.el
+++ b/modules/module-org.el
@@ -331,14 +331,13 @@ will function properly."
 
   ;; fix some org-mode + yasnippet conflicts:
   (defun yas/org-very-safe-expand ()
-    (let ((yas/fallback-behavior 'return-nil)) (yas/expand)))
+    (let ((yas-fallback-behavior 'return-nil)) (yas-expand)))
 
-  (add-hook 'org-mode-hook
-            (lambda ()
-              (make-variable-buffer-local 'yas/trigger-key)
-              (setq yas/trigger-key [tab])
-              (add-to-list 'org-tab-first-hook 'yas/org-very-safe-expand)
-              (define-key yas/keymap [tab] 'yas-next-field)))
+  (add-hook! org-mode
+    (make-variable-buffer-local 'yas-trigger-key)
+    (setq yas/trigger-key [tab])
+    (add-to-list 'org-tab-first-hook 'yas/org-very-safe-expand)
+    (define-key yas/keymap [tab] 'yas-next-field))
 
   ;;; Evil integration
   (progn