Using cleaving for place adjunct: I have lived in the same city

Using cleaving for place adjunct:
I have lived in the same city for ten years.
【正确答案】：It is in the same city that I have lived for ten years.