I am aware of the idiom like a fish out of water. What intrigued me is an article using like a fish takes to water.

Teo Zhen Ren, the swimming sensation from Singapore, took to swimming like a fish takes to water.

Is like a fish takes to water a valid usage? Is it an idiom? I thought the usual phrase was like a duck takes to water.