Fix s_insert() to store pointer instead of id

Fix s_insert() to store pointer instead of id #384