When I heard Challa in the latest album by Rabbi Shergill - Avengi Ja Nahin - I found the music familiar than usual. I remembered that there was an old song by Gurdas Maan on the same lines. A quick search gave me the desired results. Here are both versions for you. Similar music, different lyrics but same soul of Punjabi folk music.
Note: Any further insight on these songs and their relation will be much appreciated. Thanks.