Update id return types to instancetype