Fix: return id instead of object