1 files changed, 6 insertions, 3 deletions
diff --git a/src/main/java/com/juick/www/api/activity/model/Activity.java b/src/main/java/com/juick/www/api/activity/model/Activity.java
index d2f905af..7cc0b13f 100644
--- a/src/main/java/com/juick/www/api/activity/model/Activity.java
+++ b/src/main/java/com/juick/www/api/activity/model/Activity.java
@@ -19,6 +19,8 @@ package com.juick.www.api.activity.model;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.juick.www.api.activity.helpers.ActivityIdDeserializer;
+import com.juick.www.api.activity.helpers.ContextDeserializer;
+
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.UUID;
@@ -27,7 +29,7 @@ public abstract class Activity extends Context {
 
     @JsonDeserialize(using = ActivityIdDeserializer.class)
     private String actor;
-    private Object object;
+    private Context object;
 
     public String getActor() {
         return actor;
@@ -40,11 +42,12 @@ public abstract class Activity extends Context {
         }
     }
 
-    public Object getObject() {
+    @JsonDeserialize(using = ContextDeserializer.class)
+    public Context getObject() {
         return object;
     }
 
-    public void setObject(Object object) {
+    public void setObject(Context object) {
         this.object = object;
     }
 }