diff --git a/mod/survey/download.php b/mod/survey/download.php
index 79a2671d512..267e810adad 100644
--- a/mod/survey/download.php
+++ b/mod/survey/download.php
@@ -8,7 +8,7 @@
     $type  = optional_param('type', 'xls', PARAM_ALPHA);
     $group = optional_param('group', 0, PARAM_INT);
 
-    if (! $cm = get_record("course_modules", "id", $id)) {
+    if (! $cm = get_coursemodule_from_id('survey', $id)) {
         error("Course Module ID was incorrect");
     }
 
diff --git a/mod/workshop/upload.php b/mod/workshop/upload.php
index 3b259f00933..8a843be9e7d 100644
--- a/mod/workshop/upload.php
+++ b/mod/workshop/upload.php
@@ -7,7 +7,7 @@
     $id = required_param('id', PARAM_INT);          // CM ID
 
 
-    if (! $cm = get_record("course_modules", "id", $id)) {
+    if (! $cm = get_coursemodule_from_id('workshop', $id)) {
         error("Course Module ID was incorrect");
     }
     if (! $course = get_record("course", "id", $cm->course)) {