diff --git a/lib/classes/JsonApi/Schemas/Courseware/Unit.php b/lib/classes/JsonApi/Schemas/Courseware/Unit.php
index a1c554ec62c05e3d4ce8c8bcb09a49bcc600a762..39d201380848172adda4f0ddd72a90aac7013c61 100644
--- a/lib/classes/JsonApi/Schemas/Courseware/Unit.php
+++ b/lib/classes/JsonApi/Schemas/Courseware/Unit.php
@@ -44,7 +44,7 @@ class Unit extends SchemaProvider
     {
         $relationships = [];
 
-        $relationships[self::REL_CREATOR] = $resource['creator_id']
+        $relationships[self::REL_CREATOR] = $resource->creator
             ? [
                 self::RELATIONSHIP_LINKS => [
                     Link::RELATED => $this->createLinkToResource($resource->creator),
@@ -53,7 +53,7 @@ class Unit extends SchemaProvider
             ]
             : [self::RELATIONSHIP_DATA => null];
 
-        $relationships[self::REL_STRUCTURAL_ELEMENT] = $resource['structural_element_id']
+        $relationships[self::REL_STRUCTURAL_ELEMENT] = $resource->structural_element
             ? [
                 self::RELATIONSHIP_LINKS => [
                     Link::RELATED => $this->createLinkToResource($resource->structural_element),
@@ -76,4 +76,4 @@ class Unit extends SchemaProvider
 
         return $relationships;
     }
-}
\ No newline at end of file
+}